* lisp/desktop.el (desktop-clear): Skip the daemon's frame (Bug#26912).

diff --git a/lisp/desktop.el b/lisp/desktop.el
index 39dc92fabe2aa7343054cb267fcbfc6c4c56d49a..540d0e3b11d5a8430ae8c373be87466265e00bbe 100644 (file)
--- a/lisp/desktop.el
+++ b/lisp/desktop.el
@@ -733,6 +733,10 @@ if different)."
        (condition-case err
            (unless (or (eq frame this)
                        (eq frame mini)
+                        ;; Don't delete daemon's initial frame, or
+                        ;; we'll never be able to close the last
+                        ;; client's frame (Bug#26912).
+                        (if (daemonp) (not (frame-parameter frame 'client)))
                        (frame-parameter frame 'desktop-dont-clear))
              (delete-frame frame))
          (error